101. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:45 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

101.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/etc/import	demo03_old.xml	2019-12-13 09:04:04 +0000
2			2021-05-13 09:08:45 +0000

101.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	804

101.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

101.4 Active regular expressions

No regular expressions were active.

101.5 Comparison detail

1		<root>
2		<config>
3
4		<web>
5
6		<default>
7
8		<cms_home_page>
9		porto_home_3_old
10		</cms_home_page>
11
12		<cms_no_route>
13		no-route-2
14		</cms_no_route>
15
16		</default>
17
18		</web>
19
20		<cms>
21
22		<wysiwyg>
23
24		<enabled>
25		hidden
26		</enabled>
27
28		</wysiwyg>
29
30		</cms>
31		»
32		<design>
33		» »
34		<header>
35		» » »
36		<logo_width>
37		</logo_width>
38		» » »
39		<logo_height>
40		</logo_height>
41		» » »
42		<logo_src>
43		default/logo_black.png
44		</logo_src>
45		» »
46		</header>
47		»
48		</design>
49		»
50		<dev>
51		» »
52		<js>
53		» » »
54		<merge_files>
55		1
56		</merge_files>
57		» »
58		</js>
59		»
60		</dev>
61
62		<porto_settings>
63
64		<general>
65
66		<boxed>
67		wide
68		</boxed>
69
70		<layout>
71		1140
72		</layout>
73
74		<disable_border_radius>
75		1
76		</disable_border_radius>
77
78		<show_site_notice>
79		1
80		</show_site_notice>
81
82		</general>
83
84		<header>
85
86		<header_type>
87		2
88		</header_type>
89
90		<static_block>
91		porto_custom_block_for_header
92		</static_block>
93
94		<sticky_header_logo>
95		</sticky_header_logo>
96
97		</header>
98
99		<footer>
100
101		<footer_top>
102		0
103		</footer_top>
104
105		<footer_top_block>
106		custom
107		</footer_top_block>
108
109		<footer_top_custom>
110		</footer_top_custom>
111
112		<footer_middle>
113		1
114		</footer_middle>
115
116		<footer_ribbon>
117		0
118		</footer_ribbon>
119
120		<footer_ribbon_text>
121		Ribbon Text
122		</footer_ribbon_text>
123
124		<footer_middle_column_1>
125		custom
126		</footer_middle_column_1>
127
128		<footer_middle_column_1_custom>
129		porto_footer_middle_logo_block_for_3
130		</footer_middle_column_1_custom>
131
132		<footer_middle_column_1_size>
133		3
134		</footer_middle_column_1_size>
135
136		<footer_middle_column_2>
137		custom
138		</footer_middle_column_2>
139
140		<footer_middle_column_2_custom>
141		porto_footer_features
142		</footer_middle_column_2_custom>
143
144		<footer_middle_column_2_size>
145		3
146		</footer_middle_column_2_size>
147
148		<footer_middle_column_3>
149		custom
150		</footer_middle_column_3>
151
152		<footer_middle_column_3_custom>
153		porto_footer_links
154		</footer_middle_column_3_custom>
155
156		<footer_middle_column_3_size>
157		3
158		</footer_middle_column_3_size>
159
160		<footer_middle_column_4>
161		custom
162		</footer_middle_column_4>
163
164		<footer_middle_column_4_custom>
165		porto_footer_contact_information
166		</footer_middle_column_4_custom>
167
168		<footer_middle_column_4_size>
169		3
170		</footer_middle_column_4_size>
171
172		<footer_middle_2>
173		0
174		</footer_middle_2>
175
176		<footer_middle_2_column_1>
177		custom
178		</footer_middle_2_column_1>
179
180		<footer_middle_2_column_1_custom>
181		porto_footer_links
182		</footer_middle_2_column_1_custom>
183
184		<footer_middle_2_column_1_size>
185		3
186		</footer_middle_2_column_1_size>
187
188		<footer_middle_2_column_2>
189		custom
190		</footer_middle_2_column_2>
191
192		<footer_middle_2_column_2_custom>
193		porto_footer_links
194		</footer_middle_2_column_2_custom>
195
196		<footer_middle_2_column_2_size>
197		3
198		</footer_middle_2_column_2_size>
199
200		<footer_middle_2_column_3>
201		custom
202		</footer_middle_2_column_3>
203
204		<footer_middle_2_column_3_custom>
205		porto_footer_links
206		</footer_middle_2_column_3_custom>
207
208		<footer_middle_2_column_3_size>
209		3
210		</footer_middle_2_column_3_size>
211
212		<footer_middle_2_column_4>
213		custom
214		</footer_middle_2_column_4>
215
216		<footer_middle_2_column_4_custom>
217		porto_footer_links
218		</footer_middle_2_column_4_custom>
219
220		<footer_middle_2_column_4_size>
221		3
222		</footer_middle_2_column_4_size>
223
224		<footer_bottom>
225		1
226		</footer_bottom>
227
228		<footer_store_switcher>
229		0
230		</footer_store_switcher>
231
232		<footer_logo_src>
233		</footer_logo_src>
234
235		<footer_bottom_copyrights>
236		<![CDATA[©Copyright 2020 by PORTO. All Rights Reserved.]]>
237		</footer_bottom_copyrights>
238
239		<footer_bottom_custom_1>
240		porto_footer_bottom_custom_block
241		</footer_bottom_custom_1>
242
243		<footer_bottom_custom_2>
244		</footer_bottom_custom_2>
245
246		</footer>
247
248		<category>
249
250		<alternative_image>
251		1
252		</alternative_image>
253
254		<aspect_ratio>
255		0
256		</aspect_ratio>
257
258		<ratio_width>
259		300
260		</ratio_width>
261
262		<ratio_height>
263		400
264		</ratio_height>
265
266		<rating_star>
267		1
268		</rating_star>
269
270		<product_price>
271		1
272		</product_price>
273
274		<actions>
275		1
276		</actions>
277
278		<addtocompare>
279		1
280		</addtocompare>
281
282		<addtowishlist>
283		1
284		</addtowishlist>
285
286		<page_layout>
287		2columns-left
288		</page_layout>
289
290		<category_description>
291		main_column
292		</category_description>
293
294		<side_custom_block>
295		porto_category_side_custom_block
296		</side_custom_block>
297
298		</category>
299
300		<category_grid>
301
302		<product_type>
303		3
304		</product_type>
305
306		<columns>
307		4
308		</columns>
309
310		</category_grid>
311
312		<product>
313
314		<product_image_size>
315		6
316		</product_image_size>
317
318		<side_custom_block>
319		porto_product_side_custom_block
320		</side_custom_block>
321
322		<main_custom_block>
323		</main_custom_block>
324
325		<main_custom_block2>
326		</main_custom_block2>
327
328		<move_addtolinks>
329		0
330		</move_addtolinks>
331
332		<move_upsell_full>
333		0
334		</move_upsell_full>
335
336		<page_layout>
337		2columns-right
338		</page_layout>
339
340		<tab_full_background>
341		0
342		</tab_full_background>
343
344		<custom_block_next_tab>
345		</custom_block_next_tab>
346
347		<upsell_columns>
348		4
349		</upsell_columns>
350
351		<move_upsell>
352		0
353		</move_upsell>
354
355		</product>
356		» »
357		<newsletter>
358		» » »
359		<logo_src>
360		default/logo_black.png
361		</logo_src>
362		» »
363		</newsletter>
364
365		<contacts>
366
367		<enable>
368		1
369		</enable>
370
371		<full_width>
372		0
373		</full_width>
374
375		<address>
376		Porto2 Store
377		</address>
378
379		<latitude>
380		-34.398
381		</latitude>
382
383		<longitude>
384		150.884
385		</longitude>
386
387		<zoom>
388		18
389		</zoom>
390
391		<infoblock>
392		<![CDATA[<div class="row">
393		<div class="col-md-12">
394		<i class="porto-icon-phone"></i>
395		<p>0201 203 2032</p>
396		<p>0201 203 2032</p>
397		</div>
398		</div>
399		<div class="row">
400		<div class="col-md-12">
401		<i class="porto-icon-mobile"></i>
402		<p>201-123-3922</p>
403		<p>302-123-3928</p>
404		</div>
405		</div>
406		<div class="row">
407		<div class="col-md-12">
408		<i class="porto-icon-mail-alt"></i>
409		<p>porto@gmail.com</p>
410		<p>porto@portotemplate.com</p>
411		</div>
412		</div>
413		<div class="row">
414		<div class="col-md-12">
415		<i class="porto-icon-skype"></i>
416		<p>porto_skype</p>
417		<p>proto_template</p>
418		</div>
419		</div>]]>
420		</infoblock>
421
422		<customblock>
423		</customblock>
424
425		</contacts>
426
427		<custom_settings>
428
429		<custom_style>
430		<![CDATA[.page-header.type2 .block-search input {
431		border-width: 3px;
432		height: 44px;
433		}
434		.page-header.type2 .block-search .action.search {
435		height: 44px;
436		}
437		header.page-header.type2.sticky-header .nav-sections {
438		background-color: #f3f5f4;
439		}
440		header.page-header.sticky-header.type2 .minicart-wrapper .action.showcart:before {
441		color: #000;
442		}
443		header.page-header.sticky-header.type2 .minicart-wrapper .action.showcart .counter.qty {
444		color: #fff;
445		}
446		.footer-middle > .container {
447		padding: 40px 30px;
448		background-color: #e7e8e9;
449		}
450		.footer-middle {
451		padding: 0;
452		}
453		.footer-middle > .container, .footer-bottom > .container {
454		max-width: 1140px;
455		}
456		.block-category-list {
457		margin-bottom: 15px;
458		}
459		.products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {
460		border-radius: 0 0 5px 5px;
461		font-family: "Open Sans";
462		letter-spacing: 0;
463		}
464		.price-box .price {
465		font-family: "Open Sans";
466		font-weight: 600;
467		}]]>
468		</custom_style>
469
470		<custom_style_2>
471		<![CDATA[]]>
472		</custom_style_2>
473
474		</custom_settings>
475
476		</porto_settings>
477
478		<porto_design>
479
480		<general>
481
482		<theme_color>
483		B7A788
484		</theme_color>
485
486		</general>
487
488		<font>
489
490		<custom>
491		0
492		</custom>
493
494		<font_size>
495		</font_size>
496
497		<font_family>
498		</font_family>
499
500		<custom_font_family>
501		</custom_font_family>
502
503		<google_font_family>
504		</google_font_family>
505
506		<char_latin_ext>
507		</char_latin_ext>
508
509		<char_subset>
510		</char_subset>
511
512		</font>
513
514		<colors>
515
516		<custom>
517		0
518		</custom>
519
520		<text_color>
521		</text_color>
522
523		<link_color>
524		</link_color>
525
526		<link_hover_color>
527		</link_hover_color>
528
529		<button_bg_color>
530		</button_bg_color>
531
532		<button_text_color>
533		</button_text_color>
534
535		<button_hover_bg_color>
536		</button_hover_bg_color>
537
538		<button_hover_text_color>
539		</button_hover_text_color>
540
541		<addtowishlist_color>
542		</addtowishlist_color>
543
544		<addtowishlist_hover_color>
545		</addtowishlist_hover_color>
546
547		<addtocompare_color>
548		</addtocompare_color>
549
550		<addtocompare_hover_color>
551		</addtocompare_hover_color>
552
553		<breadcrumbs_bg_color>
554		</breadcrumbs_bg_color>
555
556		<breadcrumbs_color>
557		</breadcrumbs_color>
558
559		<breadcrumbs_links_color>
560		</breadcrumbs_links_color>
561
562		<breadcrumbs_links_hover_color>
563		</breadcrumbs_links_hover_color>
564
565		<sale_bg_color>
566		</sale_bg_color>
567
568		<sale_font_color>
569		</sale_font_color>
570
571		<new_bg_color>
572		</new_bg_color>
573
574		<new_font_color>
575		</new_font_color>
576
577		</colors>
578
579		<header>
580
581		<custom>
582		1
583		</custom>
584
585		<header_bgcolor>
586		transparent
587		</header_bgcolor>
588
589		<header_bg_image>
590		</header_bg_image>
591
592		<header_bordercolor>
593		</header_bordercolor>
594
595		<header_textcolor>
596		777777
597		</header_textcolor>
598
599		<header_linkcolor>
600		777777
601		</header_linkcolor>
602
603		<header_top_links_bgcolor>
604		B7A788
605		</header_top_links_bgcolor>
606
607		<header_top_links_color>
608		FFFFFF
609		</header_top_links_color>
610
611		<header_menu_bgcolor>
612		transparent
613		</header_menu_bgcolor>
614
615		<header_menu_color>
616		796848
617		</header_menu_color>
618
619		<header_menu_hover_bgcolor>
620		</header_menu_hover_bgcolor>
621
622		<header_menu_hover_color>
623		39333F
624		</header_menu_hover_color>
625
626		<header_menu_classicmenu_bgcolor>
627		</header_menu_classicmenu_bgcolor>
628
629		<header_menu_classicmenu_bordercolor>
630		</header_menu_classicmenu_bordercolor>
631
632		<header_menu_classicmenu_color>
633		</header_menu_classicmenu_color>
634
635		<header_menu_classicmenu_hover_bgcolor>
636		</header_menu_classicmenu_hover_bgcolor>
637
638		<header_menu_classicmenu_hover_color>
639		</header_menu_classicmenu_hover_color>
640
641		<header_search_bgcolor>
642		FFFFFF
643		</header_search_bgcolor>
644
645		<header_search_text_color>
646		777777
647		</header_search_text_color>
648
649		<header_search_bordercolor>
650		B7A788
651		</header_search_bordercolor>
652
653		<header_minicart_bgcolor>
654		</header_minicart_bgcolor>
655
656		<header_minicart_color>
657		FFFFFF
658		</header_minicart_color>
659
660		<header_minicart_icon_color>
661		39333F
662		</header_minicart_icon_color>
663
664		</header>
665
666		<footer>
667
668		<custom>
669		1
670		</custom>
671
672		<footer_top_bgcolor>
673		transparent
674		</footer_top_bgcolor>
675
676		<footer_top_color>
677		</footer_top_color>
678
679		<footer_top_link_color>
680		</footer_top_link_color>
681
682		<footer_top_link_hover_color>
683		</footer_top_link_hover_color>
684
685		<footer_middle_bgcolor>
686		transparent
687		</footer_middle_bgcolor>
688
689		<footer_middle_color>
690		777777
691		</footer_middle_color>
692
693		<footer_middle_link_color>
694		777777
695		</footer_middle_link_color>
696
697		<footer_middle_link_hover_color>
698		777777
699		</footer_middle_link_hover_color>
700
701		<footer_middle_title_color>
702		333333
703		</footer_middle_title_color>
704
705		<footer_middle_links_icon_color>
706		333333
707		</footer_middle_links_icon_color>
708
709		<footer_middle_ribbon_bgcolor>
710		B7A788
711		</footer_middle_ribbon_bgcolor>
712
713		<footer_middle_ribbon_shadow_color>
714		8A7B5F
715		</footer_middle_ribbon_shadow_color>
716
717		<footer_middle_ribbon_color>
718		</footer_middle_ribbon_color>
719
720		<footer_middle_2_bgcolor>
721		</footer_middle_2_bgcolor>
722
723		<footer_middle_2_color>
724		</footer_middle_2_color>
725
726		<footer_middle_2_link_color>
727		</footer_middle_2_link_color>
728
729		<footer_middle_2_link_hover_color>
730		</footer_middle_2_link_hover_color>
731
732		<footer_middle_2_title_color>
733		</footer_middle_2_title_color>
734
735		<footer_middle_2_links_icon_color>
736		</footer_middle_2_links_icon_color>
737
738		<footer_bottom_bgcolor>
739		transparent
740		</footer_bottom_bgcolor>
741
742		<footer_bottom_color>
743		</footer_bottom_color>
744
745		<footer_bottom_link_color>
746		</footer_bottom_link_color>
747
748		<footer_bottom_link_hover_color>
749		</footer_bottom_link_hover_color>
750
751		</footer>
752
753		<page>
754
755		<custom>
756		1
757		</custom>
758
759		<page_bgcolor>
760		F3F5F4
761		</page_bgcolor>
762
763		<page_bg_image>
764		</page_bg_image>
765
766		<page_custom_style>
767		<![CDATA[]]>
768		</page_custom_style>
769
770		</page>
771
772		<main>
773
774		<custom>
775		0
776		</custom>
777
778		<main_bgcolor>
779		</main_bgcolor>
780
781		<main_bg_image>
782		</main_bg_image>
783
784		<main_custom_style>
785		<![CDATA[]]>
786		</main_custom_style>
787
788		</main>
789
790		</porto_design>
791
792		<mpsearch>
793
794		<general>
795
796		<enabled>
797		0
798		</enabled>
799
800		</general>
801
802		</mpsearch>
803		</config>
804		</root>